Modal for form input
Fixed merge conflicts