replaced will_paginate with kaminari
cleaned up a couple lines of code