Fixed some padding/margin issues