Fixes #171, fixes #186

An overly large looking commit with some test fixes as well as the main goal of tidying up the Public Share Rooms UX