diff --git a/foundation/erpnext_foundation/doctype/foundation_fellowship/templates/foundation_fellowship_rule.md b/foundation/erpnext_foundation/doctype/foundation_fellowship/templates/foundation_fellowship_rule.md
new file mode 100644
index 00000000..aeabfabc
--- /dev/null
+++ b/foundation/erpnext_foundation/doctype/foundation_fellowship/templates/foundation_fellowship_rule.md
@@ -0,0 +1,21 @@
+
+ A Foundation member has to propose name. Foundation Fellow Committee (Foundation Governance Council till the committee is formed) will decide on whether the person qualifies.
+ A Fellowship is a honorary position and may come with certain benefits as decided by the Foundation Fellow Committee.
+ It can be for contributions for which the person got paid, directly by the Foundation, or by the ERPNext ecosystem, stakeholders, service providers, users or user organizations.
+ Fellowship can be revoked by the Fellowship Committee for any reason.
+ Minimum 3 months of contribution on ERPNext.
+
+ - Localising ERPNext to a country's requirements
+ - Enhancing existing modules
+ - Creating new modules
+ - Extending ERPNext to new industries, verticals
+ - Growing the ERPNext userbase in a country, region.
+
+ Typical reasons (not a complete listing) for revoking Fellowship are:
+
+ - Contributions were plagiarized from another ERPNext contributor
+ - Fellow indulges in criminal or antisocial behavior
+ - Fellow starts working against ERPNext interests and starts actively denouncing ERPNext in public and/or social forums.
+
+ Following are the community driven Foundation Fellows:
+
diff --git a/foundation/templates/includes/sponsors.html b/foundation/templates/includes/sponsors.html
index eed074da..cd04afeb 100644
--- a/foundation/templates/includes/sponsors.html
+++ b/foundation/templates/includes/sponsors.html
@@ -63,7 +63,7 @@
Become a patron for the conference and get associated with a global community
of tens of thousands of users and developers. Sponsors also get 5 complimentary passes for the full conference!
-
Become A Sponsor
+
Become A Sponsor
diff --git a/foundation/www/conf/2017/index.html b/foundation/www/conf/2017/index.html
index eff560d0..bbce696b 100644
--- a/foundation/www/conf/2017/index.html
+++ b/foundation/www/conf/2017/index.html
@@ -12,7 +12,8 @@
ERPNext Conference 2017, Mumbai
October 12th to 14th
- Watch the Live Stream
+
Watch ERPNext Conference 2017 - Community Talks
+
Watch ERPNext Conference 2017 - Developer Talks
Three days of amazing talks and discussions. See the full agenda.