Fix navigation and layout