Solved edit item and added text and better presentation for the templates