Added login base, cleaning up app flow