Some changes in: "Reworked Navigation Bar Dimensions [WIP] (2/2)"

Change-Id: I0fd6425adbe437fc7f132d1f993d28ece65c2d29