Bugfixes

Fixing some layout and routing bugs.