refactor templates
add public field to content model
fix manage