Shindig: Patch 1.1 - Navigation hotfixes

Fixed some minor navigation problems.