Fixed some style and navigation problems