UI improvements, refinements and optimisations.