Revert "Navigation bar dimensions and Master..."

This reverts commit ca65e2b6796c1f7a3a0cc42139850f6db1e6b85d.

Change-Id: I0f4e7e011dca84087012d868fb41e02ee9e7840d