more UI improvements