Add spans to demo page
Fix minor layout/rendering bugs found in 480px layout