working on making code easier + UI changes