tags done and admin main file refactored