UI imporved in master