multiple fixes for different margins
--multiple fixes for margins all over the place. More specific how they are calculated and when they are used