Made li's clickable.
Fixed merge conflicts.