Changed layout (again), this time for good

Let's hope. It's really good looking and I don't have anything wrong
with it from my gut. So it's probably a keeper.