- Routing fixes and ui spacing tweaks