re-arrange xmls and tweaks