added dynamic switching of xml layouts
fixed conflict in xml