UI improvements.
Some error handling.