Add labels preferences + minor fixes.