moved design related borders where they belong