Consolidate buttons to Spinner, create circle draw button.