Fix XML indentation
Final layout fixes