Add final review section, reorganize