added grid and margin layouts