Join page modification
Fixed the conflict
Merge branch 'master' of https://github.com/bigv220/darkgreen