Moved static layout to public