Reorganized and Refined

Reorganized options for selecting shape, color, and size to the
ChoicesJPanel as indicated in the ARGO diagrams. Added minor edits and
fixes to make the app more refined.