Changed navigation and some styling