#5: more XMLs for testing
#5: layout fixes