tidying things up and adding list_display for Gap