Various tweaks, journal page still a work in progress