Added icons
Cleaned up code SIGNIFICANTLY