XML format improvements and empty input textbox checks