refactor the app to clean stuff up and move to the new design