Cleanup. Added xaml editor + functionality.