still UI changes
almost done with UI