Started working on the join page
Merge remote-tracking branch 'origin/Gal'