Minor UI modifications