fixing up the screens for the general app's flow