#15 small changes to get it working (apart from main_page and new_collections