Revert "Navigation bar dimensions and Master switch (1/2)"

This reverts commit ca65e2b6796c1f7a3a0cc42139850f6db1e6b85d.

Change-Id: I3d82d320a8b9cd3641f713e1dbb5e3d2cc0cf210