adding pagination. Moving views to be inline