Tweaked clips to not require a layout to work.