more template work + added manage