Removed the class templating and went back to strings
Mounts without sources no longer show up
Merge remote-tracking branch 'origin/state-display'

Conflicts:
	server.py