building architecture for new ui design, cleaning things up