updates to fnd page design and structure
Merge branch 'fnd-work'