Small UI fixes