Refactor app design