CSS output fixes for spacing and border