moved around the update step
Merge remote-tracking branch 'origin/dev' into dev
added adjusted the screen size