New design

Not sure I like the task items, but we'll see...