Modified poppyview for grid and improved history
Minor changes
Merge remote-tracking branch 'upstream/master'