Added screens + update FX part