Changed motivation a bit
Delete internal layout