Removed click event, other adjustments