Refactor app to include new design