Minor refactoring.
Grid Fragment added .
Merge remote-tracking branch 'origin/master'