Small UI bugfixing