layout changes, also pulled out logic for checking task completion in the settings activity into a stand-alone function