modal and content fixes