modal fixes, style format etc