Added nav buttons and real paging