More fixes, moving content around, button for demo, buttons for
downloads