Fixed admin bug + more