some more UI improvements