fix: cleaned code, minor bugs, and preserve reading state while dragging
Merge of conflicting commits

Conflicts:
	app/js/directives.js