UI enhancements
last fixes