Small changes. Will have to integrate will_paginate next