Fixing Rework
And DB migration as well
Merge pull request #263 from PonteIneptique/new_guides

New guides fix + DB