General cleaning
Added icons
Minor tweaks
Restructuring of markup
Added icons
Removed unrequired icon