Fix research page and new system page - Part 3