Final commit for ui dev. Complete and ready for merge with master for a release.