Refactored appview flow