Updated to allow up to 1920 screen size