fix class path
minor fixes

Conflicts:
	res/xml/settings_headers.xml
move to general catagory