Add click listener and rework fragments