UI improovements and watchdog errors
suggested by Danny Joris
Merge pull request #102 from willtp87/7.x

UI improovements and watchdog errors