Fixed some design and navigation issues.