Visual redo on the option icons.  Also cleaned up some of the event
logic for clicking on options.