Added Better icons
Added Comments