xml bug fixed
reworked XML layout