Fixes mobile and padding issues on mobile and tablet

Fixes all of previous commit on margin/padding fixes but this time doesn't break borders.