some improvements on General Tab