Large update including done page initial prototype