ref #127, grid fix. Further HTML cleanup and tweaks.
Merge pull request #128 from vexorian/gridfixhtmlclean

Fix grid. Further HTML cleanup and tweaks.