Add support for view layouts