fixing small issues
small ux optimisations