XML code formatted to be more readable. All fill_parents updated to
match_parents, all 'px' references updated to 'dip'