Fix some margin issues