Smarter setting of Step titles
Removed some redundant variables now that site settings are made global