about us page, edits on footer
aligned about us grid
clean up merge