Added spacers in all forms