Screen switching works, added new screens