Split up parts of UI into more objects, and beautified