Fixed some margin stuff