Update Navigation & Add timeline