working on UI
lots of ui changes