Rework app flow