Following spacing fixes

- and upgrade to latest user-preferences for changed forlaters event name