Simplify class variables, and fix "display on index" ACP setting