Simplify notebook rules, fix Safari rendering