Feature/193 2 fixes for view calibration

https://trello.com/c/du0o3xdC/193-2-fixes-for-view-calibration