Changed layout navigation a bit