Settings: NavBar dimensions
Height
Weight

and some clean ups

Change-Id: I99d59bd9473697bc13ae79f7ccad6d6db6e6f8ee