Style fixes on admin.
Merge branch 'develop'