Feature/193 2 fixes for view calibration

https://trello.com/c/du0o3xdC/193-2-fixes-for-view-calibration
https://trello.com/c/Z9Cz4o8G/214-graph-titles-off-to-the-side