improved Project and Item templates