Working on click index fix
Adds more controls and places them at footer