ui refactor, break apart isolated components