working on ui
added more ui changes