refactoring
fixed admin issue