Improved layout margins and arrangements