Added rectangle mode
Added the first circle mode