some ui enhancments