Fixing space problems - final touch