Tightened up publish rules and fixed some loading/display issues