LB-91: Refactor admin templates

comments
LB-91: Refactor admin templates

flicker fixed.