Ok I think this fixes all the spacing in all the modes.