Minor cleanup
Merge commit
Fixed bug clicking outside of list item