more work on grid, some typograpjy