Sample updates
Merge pull request #1525 from benjamij/file-grid-change

Widget updates