Still more improvements to div