update
Merge branch 'raven'
improve admin details