Small UI improvements in options