added rows and cols to layout and included mixin files