Initial UI enhancements