Mostly cleanup
Adds changes and fixes on the layout files.
Adds initial work on settings dialog.