Ui fixes

Some files added. At some point these changes will be a bit more modular - maybe we should tie them to issues.