Shapes and radiobutton fixed