Added support for flexible grid system