Merge pull request #258 from raviosc/developer125

Developer125
change done by dev20 for navigation
Merge pull request #259 from raviosc/developer20

change done by dev20 for navigation
Changes for home page issues
Merge remote-tracking branch 'origin/master'