MainWindow.xaml

Added buttons and stuff
MainWindow.xaml

Removed margins, Grid.Column/Grid.Row wherever possible
Merged changes