added more UI improvements