Refactoring

Refactoring
Make sure the current index is at top of the css z-index stack
Merge remote branch 'origin/master'