Fix error and a couple UI tweaks