Mostly UI with a few crash/stability fixes