adding redesign + code refactoring + i18nization + french/en support
making a few changes based on Jason recommendations
getting it right this time :)
Fix conflicts

Maybe