Typos and UI fixes