Change system design headers

The headers were changed to suit the new location on top level.