Last UI enhancements before the demo