Improved demo small screen support