Started improving presentation to look like in mock-ups