Added better UI stuff.