lots of ui work
adding more ui