Cleaned up template and name spaced the items