*more UI improvements