Fix for spacing and border fields. Sould be primetime now.