added and remove some screens and stuff