tidy up code, add Grid