minor changes and UI fixes