Add black hole register mappings; clean up layout.