big tidy up, have shelved neat for the grid for now, since my layout is only one column