refactored the index form yet again