Added layout and grunt support