Fixing up url and admin format