UI 2.1

Small UI enhancement