UI improvements; bug fixes