UX Updates

Added some UX and other cleanup