removed some templated code, added escape, added dedicated controllers