Updating modals and fixing facet features #428