join from status page and some cleanup