Modified navigation and main layout