Some UI improvements

Some UI improvements