More progress on UI - added error handling and descriptions