Nesting

This branch has already changed the html structure (hence the name nesting). This should be merged into master, as it is being developed on as though it were the master branch.

@mgottein You can merge it. It's your code. =P