Added in icons.  Worked on refactoring cleanup