Fix for the Circular Ref Error, also renamed the LayoutSelector to CardLayoutSelector