Improve display for demo