various UI improvments