Many minor changes.
Added new templates, improved design.