Layout 2013

Here are the first layout improvements for the example thesis. I'll create another pull request for further improvements.