Changes from the ui-greg branch

including the new settings page