Update styles
Remove binding
Style navBar
More code cleanup