Merge pull request #563 from daeks/spaces

Fix: softtab fix
fix sizing issue