Added admin controle + few changes