Fixed crash causing XML bug
Minor changes to layout.