added the screen
Merge branch 'devJ'