Added stubs for all of the screens, need to add look for some more of them
Merged changed