Add in FSD rev2 and modify the overall layout of pages