Fix some minor modal window issues