Made rotations faster and fixed positioning