Remove pre padding, fixing a few layout issues