Rename Notebook to Journal and tweaks