Merge pull request #38 from sparkbox/yamlwork

work: supposed to use yaml, used partials instead
fix:fixing merge issues with sign-up and master