Small UI bugfixes and improvements