Improved workspace handling in xaml