Fix a few bugs and started reworking the listing structure