Moved Buttons into Index