removed container div, removed second if first, it breaks templates