Fixed routing and layout issues