Updated the demo page with more UXish layout