Redesign, add speak notes