Added one pixel padding on top and a preference to turn it off.
Set ordinal on window controls to make sure they end up at the end.