Small fixes to the repositories and README
Removed some redundant code and fixes

Site nagivation editing was broke.
Merge remote-tracking branch 'origin/v-1'