updates to join page
fix merge conflicts