Update and rename modal.html to includes/modal.html