remove second view and click events
Fix to be more generic