Apply drawer behavior to blocks, make markup for drawer and remove-block elements more consistent.