Edited and added some screens