UI improvements, small cleanup