Little changes for onclick