Fixes issue where checkable items would disappear when navigating between views
Merge branch 'fix/checkable_layout' into develop