Completed base for Settings UI + More restructure