Small UI tweaks and color improvements