Rework to get spaces more nicly

> currently not working