ui enhancement, cleaning and optimisation