removed some pointless margins and paddings