Add block placeholders and improve selection behavior.