Reformat and add side nav