simplify layout
statement fork and delete (rename) and index minor changes