UI changes, and a crash fix