Some fixes, refactored admin menu