Fixing issue with controls and single pages