Minor syntax and UI fixes