polish code
Merge branch 'feature/admin_preview' into develop