minor ui fix and improvements