UI enhancements

image markup