Formatted xaml
Added Save method
Refactored code