(wip)(03-20) Adding settings activity
(minor) Renaming some view text
Adds settings screen on main and detail activities