* UI improvements
* Bug fixes