admin markup improvements