Removed html structure errors from templates