CON-2102 | Fix for different screensizes