refactoring indexjs
finished refactoring indexjs
contintued refactoring in indexjs
merged with application changes
merged front end changes