Removed references to custom layout object, still in development
Removed references to custom layout object, still in development