Rave screen modifications
view rave popup modifications
fix conflicts