Fixed some margin issues