Fixed rotation and added more shapes