LPS-47199 don't merge yet --> please read description :)

@ealonso has applied the changes you requested for Journal. Is this ok for you now?

Once you like it, @arbetts will apply the same pattern to the rest of the portal. 

Thanks!