Updated listing format

It is still a bit buggy