Fixed some margin/paddings kinks