Added a couple of TODOs
Reduced pager width