Started cleaning up HTML on admin screens