Making more UI improvements