Some UI Enhancements

Please consider these changes. Thanks!