Framework: Fixes in NavBar

Change-Id: I035ab4a9641c49dc37724ddccac7675b6bb4a938