one more commit of ui updates before I start the really hard stuff