re-coded TapActions due to merge conflicts
changed settings layout to a TableLayout
corrected flag reset position