Fix display formatting, simply display test

Also added new files and tweaked the XML structure