Add spinners, checkboxes. Make calculator generic