Improved Sources UI feedback #823 & configuring messages to match Profiles