reorder xaml and remove x:name's

cause we don't use them anymore anyway