Add names to each end block statement

This is an optional thing Jinja2 allows for better readability. I noticed it was kinda hard to follow in some places where each block ended, so adding these in should help others visualize the structure of the layouts better.