Fix hover buttons in admin tool
Merge branch 'master' into route-cleanup