added navbar and styles
merged in from master