updated screens + added layout screen