Added info and button, fixed index