DO NOT MERGE: Implemented new in-canvas view buttons

The following are just formatting changes