Fixed some margin errors