Added screens, tweaked styles