A bunch of UI refinements; bug fixes