index update + button clean up