removing less, added jade and rework