Added all screens with navigation states