Added support for responsive layout