Added more tweaks on ui