Repaired User & login screen