Make room for the border; workaround gecko overflow bug
Get rid of bogus comment trailer