Updated the TODO list
Removed the ugly pagination hover state
merge