Fixed minor bugs with list click listener