Edited layout, order and links