Visual adjustments, add code mem
Remove fix XML