Improved look and feel
Added icon