Update native, minor UI stuff and cleanups