Added Grid type and Container width option