Minor organization
Added icon