Fixed clicking behavior and added transition