Bug is fixed. Need to fix bug with right button pressing
Added new classes for shapes