Added Click Listener correctly.
Cleaned up the click listeners walking all over each other.