Change to right-hand panels and fix issue with disappearing facets