Made the UI a little closer to the mockup