Framework: Fix Navigation Bar buttons

Change-Id: I51cda50f29089986951a893e907dd5f0e69025ba