Sam - Improved navigation and fixed chart axis