more buildout of admin front end
fixed conflict