committing ui file changes, settings page, reorg of css resources