Fixed minor navigation issues