Fix margin issues on all pages caused by new design