Story 1609: Layout fix.
Merge branch 'canfar_dev'