Change 1-index names,layout

Index names corrected. Layout changed.