Application refactoring for improved UX