Tidy layout

Looks ok on my phone. On my tablet, there's a lot of empty space that should be used somehow.