Wrap collection around atom node instead of replacing
Cleanup: slightly cleaner render code