Square up the face with better rotation