Try to fix navbar buttons

Change-Id: I03891af33bfaaf72d946bae84a7f6b897265be63