Tightening up less files, adding pagination