starting ui changes. a few cleanups