Added pagination and updated view a little bit