Canvas: Improved Navigation, Miscellaneous Bug Fixes