improved edit/add templates and removed table design