Beautified some of the UI stuff. Used partial.