Added Comments and Fixed error when clicking empty list