General updates

- Style & Navigation updates