Fixed highlighted entry in nav bar
Styling and fixed the layouts a little