Added suffix to space boxes in setup