Updated phone solution for Windows Phone 8.1 XAML