Index work

added new elements, code refactor
Merge remote-tracking branch 'origin/Development' into gh-pages