Fix URL issues
Fix modal display