fix names. reorder some layout `s elements.