Little clean up / fix admin edit mode