Added more sophisticated layout controllers