Renamed shared layout controllers