finished up the modal for new list
fixed merge conflict in the custom.css file