progress on ui refactor
more progress