Addressing the changes discussed over skype to fix#6564, and an incoming issue with #6584 in which the absence of the button will create awkward empty spaces.
Took that chance to improve the spacing even further —vertical real state.
----
bonus: changed the colour for the navbar hover status (brown -> darkgreen)
81f9b92bed