[FIX] Lines up element spaces much better