Added delegates and updated layouts