Re-arrange some sections and add editing section