removed nav bar
Merge with origin
slight tweaks