ENHANCEMENT - cleans up fix for the previous button index out of bounds issue. No longer relies on 2147483646