Screen Issue fix
Merge branch 'Fixes/Screen-Issues'