Update Sprint_4

new screens implemented