updates for cases and new layout template