Fix typos and UI