Lost a branch, managed to recover changes from stash

A few highlights: support library updated, added check for wifi watchdog and support logic to fix user bug

Layout and UI code polish