Fix getters for navbar buttons

Change-Id: Ie37ca6a213c0a83af01c349e7c426c574f4e9757