working stuff, ui changes