refactored click actions