Moved navigation bar buttons

Change-Id: Ifbdb0409a35cfd28be51b0144f93aed38dd2d796
12 files changed