Some code clean up
Admin UI update
Merge branch 'dev'