UI improvements

Improve some icons & layout.