#6 #midgart border-fixes