Fix Bug 1032993, ensure no data message always visible and other small tweaks

@AdrianGaudebert @peterbe r?