Admin style update
Merge branch 'develop'