comit for some improvements on ui