NavBar fix crashes and not repainting correctly

Change-Id: Ic88b5db49568b3862485628c738bcb3c92e8b5bf