Changed templates
Added icons and type tables