added various templates; moified user models;