Fixed grid, simplier HTML and fixed bugs