Fixing issues with toggle view links.
Merge remote branch 'origin/checkbook_edc' into checkbook_edc