change all on-clicks to on-tap and remove extra on-clicks
added returns to all functions (to stop coffeescript from returning junk)