Some fixes for layout and routes