UI Enhancements & minor fixes.