Added toggle between perspective and orthogonal and fixed roation angle, some more cleanup