Minor enhancements

Improved user experience