lots of more ui work