Adds more UI improvements