modal fixes & tweaks