completed functinality of admin side