Some fixes to brand admin