DO NOT MERGE: Implemented new in-canvas view buttons

The following happens because of an auto-format of XAML as I tweaked it slightly and removed those changes. There is no real difference in here.