Base: Improved app flow