Added the remaining non-password screens and fixed part of the code for it to be more consistent and readable