refactor ui stuff
testing
add ui popups & remove testing stuff from before