Changed the order of the screens