Fix in admin panel - activity
JAVADOC + Code Fixes