added a link to see an online users only page, tidied up some things
fix conflicts