Small UI cleanups