Base: Small UI fixes