Cleaned up UI feedback and args