UI changes and watchdog input modifications