Fixed some margin tap handlers