layout admin - minor css and html changeS
resolving conflicts