Implemented a better method to handle the list buttons in a more trustworthy way.