Improved readability

- Improved readability a lot through better visual grouping of blocks
- Fixed bug where all first and last elements would have margins removed.