Added Refresh option to UI + other enhancements