bug fixes.  small template changes.  added more icons.