source ui improvements, fixes #538