Small UI changes & roles improvement