Improved Demos UX