Fixes to show view, not done yet.