Fix venue functionality + popup, add website, other changes
Fix conflicts