Small UI fixes
Merge