Adding Markup class
Adding a Layout class, for things that change the layout