Got rid of that pesky XAML

And added more sophisticated animation