Fix some margin problems