Improve listing form, fix specs