few ui and performance optimisations