small layout improvements
move xml generation to its own file
always use strict equality