Fixed Entitys

Fixed entitys marge
administrator.xhtml

addin functionality to administrator.xhtml