Fixed some navigation bugs, styling issues