RC: NavBar fix some selection being off and refresh buttons

Change-Id: Ibfdc3c1f36f2f1ab59b154524ed477b1b6f4830a