Abstracted some elements and made the column / block system more semantic