Fix multiple UI annoyances, including closing #209