Added icon
Code cleaning
Finishing