Some work with code
Added icons