Bug and UI fixes.