Added icon, small fixes.
Reformat code, remove unneded imports