Improved 'pagination' - shows only when needed