some more UI improvements and bug fixes