Refactored index code. Clickable rows...
Fixing merge conflicts