New layout

It's still missing several things, but those will get handled in smaller daily updates over the next few days.