fixed faulty foldMaker behaviour and styling
Merge branch 'fix-code-segmentation'

Conflicts:
	lib/styles/default/style.css
	lib/styles/default/style.sass