updated User module
added TODO templates to Zone module