Got OnClickListeners working properly this time