DO NOT MERGE: Implemented new in-canvas view buttons