UI improovements and watchdog errors
suggested by Danny Joris