Quick update on the joining thing

Since we're sort of closed right now, the website shouldn't suggest otherwise
Merge branch 'dev'
Fix some items and add more items
Fix navbar height
Add more items