Add new screen and rename other screens